Merge git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <[email protected]>
Fri, 16 Dec 2016 17:46:36 +0000 (12:46 -0500)
committerTom Rini <[email protected]>
Fri, 16 Dec 2016 17:46:36 +0000 (12:46 -0500)

Trivial merge